Rename GtkActionHelper private header

Follow the naming scheme for private headers.

diff --git a/gtk/gtkactionhelper.c b/gtk/gtkactionhelper.c
index 41d3dd9cbd5615fd35f881c317f35549e04f5579..f82b16f0121f72e3e29c71df8c52545fec549c8a 100644 (file)
--- a/gtk/gtkactionhelper.c
+++ b/gtk/gtkactionhelper.c
@@ -17,10 +17,9 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
-#include "gtkactionhelper.h"
+#include "gtkactionhelperprivate.h"
 #include "gtkactionobservable.h"
 
-#include "gtkwidget.h"
 #include "gtkwidgetprivate.h"
 #include "gtkdebug.h"
 #include "gtkmodelbutton.h"

diff --git a/gtk/gtkactionhelper.h b/gtk/gtkactionhelper.h
deleted file mode 100644 (file)
index 7a3b334..0000000
--- a/gtk/gtkactionhelper.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2012 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_HELPER_H__
-#define __GTK_ACTION_HELPER_H__
-
-#include <gtk/gtkapplication.h>
-#include <gtk/gtkactionable.h>
-
-#define GTK_TYPE_ACTION_HELPER                              (gtk_action_helper_get_type ())
-#define GTK_ACTION_HELPER(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             GTK_TYPE_ACTION_HELPER, GtkActionHelper))
-#define GTK_IS_ACTION_HELPER(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             GTK_TYPE_ACTION_HELPER))
-
-typedef struct _GtkActionHelper                             GtkActionHelper;
-
-G_GNUC_INTERNAL
-GType                   gtk_action_helper_get_type                      (void);
-
-G_GNUC_INTERNAL
-GtkActionHelper *       gtk_action_helper_new                           (GtkActionable   *widget);
-
-G_GNUC_INTERNAL
-void                    gtk_action_helper_set_action_name               (GtkActionHelper *helper,
-                                                                         const gchar     *action_name);
-G_GNUC_INTERNAL
-void                    gtk_action_helper_set_action_target_value       (GtkActionHelper *helper,
-                                                                         GVariant        *action_target);
-G_GNUC_INTERNAL
-const gchar *           gtk_action_helper_get_action_name               (GtkActionHelper *helper);
-G_GNUC_INTERNAL
-GVariant *              gtk_action_helper_get_action_target_value       (GtkActionHelper *helper);
-
-G_GNUC_INTERNAL
-gboolean                gtk_action_helper_get_enabled                   (GtkActionHelper *helper);
-G_GNUC_INTERNAL
-gboolean                gtk_action_helper_get_active                    (GtkActionHelper *helper);
-
-G_GNUC_INTERNAL
-void                    gtk_action_helper_activate                      (GtkActionHelper *helper);
-
-#endif /* __GTK_ACTION_HELPER_H__ */

diff --git a/gtk/gtkactionhelperprivate.h b/gtk/gtkactionhelperprivate.h
new file mode 100644 (file)
index 0000000..7a3b334
--- /dev/null
+++ b/gtk/gtkactionhelperprivate.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2012 Canonical Limited
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_ACTION_HELPER_H__
+#define __GTK_ACTION_HELPER_H__
+
+#include <gtk/gtkapplication.h>
+#include <gtk/gtkactionable.h>
+
+#define GTK_TYPE_ACTION_HELPER                              (gtk_action_helper_get_type ())
+#define GTK_ACTION_HELPER(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
+                                                             GTK_TYPE_ACTION_HELPER, GtkActionHelper))
+#define GTK_IS_ACTION_HELPER(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
+                                                             GTK_TYPE_ACTION_HELPER))
+
+typedef struct _GtkActionHelper                             GtkActionHelper;
+
+G_GNUC_INTERNAL
+GType                   gtk_action_helper_get_type                      (void);
+
+G_GNUC_INTERNAL
+GtkActionHelper *       gtk_action_helper_new                           (GtkActionable   *widget);
+
+G_GNUC_INTERNAL
+void                    gtk_action_helper_set_action_name               (GtkActionHelper *helper,
+                                                                         const gchar     *action_name);
+G_GNUC_INTERNAL
+void                    gtk_action_helper_set_action_target_value       (GtkActionHelper *helper,
+                                                                         GVariant        *action_target);
+G_GNUC_INTERNAL
+const gchar *           gtk_action_helper_get_action_name               (GtkActionHelper *helper);
+G_GNUC_INTERNAL
+GVariant *              gtk_action_helper_get_action_target_value       (GtkActionHelper *helper);
+
+G_GNUC_INTERNAL
+gboolean                gtk_action_helper_get_enabled                   (GtkActionHelper *helper);
+G_GNUC_INTERNAL
+gboolean                gtk_action_helper_get_active                    (GtkActionHelper *helper);
+
+G_GNUC_INTERNAL
+void                    gtk_action_helper_activate                      (GtkActionHelper *helper);
+
+#endif /* __GTK_ACTION_HELPER_H__ */

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index dcd3059c4c01a82d3345708e2f7ab79fb3a738f7..d43ecf54856624ac549274041730a54cb52dc24c 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -69,7 +69,7 @@
 #include "gtkintl.h"
 #include "a11y/gtkbuttonaccessible.h"
 #include "gtkapplicationprivate.h"
-#include "gtkactionhelper.h"
+#include "gtkactionhelperprivate.h"
 #include "gtkcontainerprivate.h"
 
 /* Time out before giving up on getting a key release when animating

diff --git a/gtk/gtkbuttonprivate.h b/gtk/gtkbuttonprivate.h
index b0f79fc07bcc52e368134c97f9e0c31685f26ebe..3c7c6c8ccceb10dcd6498648ba9ef8fe25f8382f 100644 (file)
--- a/gtk/gtkbuttonprivate.h
+++ b/gtk/gtkbuttonprivate.h
@@ -19,7 +19,7 @@
 #ifndef __GTK_BUTTON_PRIVATE_H__
 #define __GTK_BUTTON_PRIVATE_H__
 
-#include "gtkactionhelper.h"
+#include "gtkactionhelperprivate.h"
 #include "gtkgesturesingle.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index 32135f32149ac3c5e3efe74d13bf71470fd2a3a8..4231e25beda209c4f76453b32fdf5474a0de5871 100644 (file)
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include "gtkactionhelper.h"
+#include "gtkactionhelperprivate.h"
 #include "gtkadjustmentprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtklistbox.h"

diff --git a/gtk/gtkmenuitemprivate.h b/gtk/gtkmenuitemprivate.h
index 73b943f028bef4f4303f6e218766fb10b7b93010..66407f64e9a7dfb97319be372d7ae4536a8da9ae 100644 (file)
--- a/gtk/gtkmenuitemprivate.h
+++ b/gtk/gtkmenuitemprivate.h
@@ -19,7 +19,7 @@
 #define __GTK_MENU_ITEM_PRIVATE_H__
 
 #include <gtk/gtkmenuitem.h>
-#include <gtk/gtkactionhelper.h>
+#include <gtk/gtkactionhelperprivate.h>
 #include <gtk/gtkcssnodeprivate.h>
 #include <gtk/gtkeventcontrollermotion.h>
 

diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index bd6f8b0f23ff85b42e233999c5d1f1b051db19a3..a4d7d380155ea2bfcc55b1fb613e8991f8c43e9e 100644 (file)
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -59,7 +59,7 @@
 #include "gtkmarshalers.h"
 #include "gtkactionable.h"
 #include "a11y/gtkswitchaccessible.h"
-#include "gtkactionhelper.h"
+#include "gtkactionhelperprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"